Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 15 Nov 2011 07:56:36 +0000 (23:56 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 15 Nov 2011 07:56:36 +0000 (23:56 -0800)

Trivial merge